From 4764d93b1679e26433b747b92a678948cdf4be01 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 15 Aug 2021 16:38:00 +0100 Subject: [PATCH] Drop patches that were applied upstream --- ...-dynamically-using-gobject-introspec.patch | 42 ------------------- debian/patches/series | 2 - ...lize-to-zero-the-tags-counting-array.patch | 40 ------------------ 3 files changed, 84 deletions(-) delete mode 100644 debian/patches/build-Get-typelib-dir-dynamically-using-gobject-introspec.patch delete mode 100644 debian/patches/textbtree-Initialize-to-zero-the-tags-counting-array.patch diff --git a/debian/patches/build-Get-typelib-dir-dynamically-using-gobject-introspec.patch b/debian/patches/build-Get-typelib-dir-dynamically-using-gobject-introspec.patch deleted file mode 100644 index 16cb51397e..0000000000 --- a/debian/patches/build-Get-typelib-dir-dynamically-using-gobject-introspec.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Thu, 8 Jul 2021 04:33:16 +0200 -Subject: build: Get typelib dir dynamically using gobject-introspection - dependency - -We hardcoded the typelib directory for only an arch (and a distro), -while we can just get it from gobject-introspection pkg config if tests -are enabled. - -Origin: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3737 ---- - meson.build | 3 +++ - testsuite/introspection/meson.build | 3 ++- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index dc78358..b10e0fd 100644 ---- a/meson.build -+++ b/meson.build -@@ -406,6 +406,9 @@ iso_codes_dep = dependency('iso-codes', required: false) - gidocgen_dep = dependency('gi-docgen', version: '>= 2021.1', - fallback: ['gi-docgen', 'dummy_dep'], - required: get_option('gtk_doc')) -+gi_dep = dependency('gobject-introspection-1.0', version: introspection_req, -+ required: get_option('introspection').enabled() and -+ get_option('build-tests')) - - fontconfig_dep = [] # only used in x11 backend - -diff --git a/testsuite/introspection/meson.build b/testsuite/introspection/meson.build -index 58eea5a..6202fb7 100644 ---- a/testsuite/introspection/meson.build -+++ b/testsuite/introspection/meson.build -@@ -3,6 +3,7 @@ test('api', - find_program('api.py', dirs: meson.current_source_dir()), - suite: ['introspection'], - env: [ -- 'GI_TYPELIB_PATH=@0@/gtk:/usr/lib64/girepository-1.0'.format(project_build_root), -+ 'GI_TYPELIB_PATH=@0@/gtk:@1@'.format(project_build_root, -+ gi_dep.get_pkgconfig_variable('typelibdir')), - 'LD_PRELOAD=@0@/gtk/libgtk-4.so'.format(project_build_root), - ]) diff --git a/debian/patches/series b/debian/patches/series index ce7ff7a1b5..73b6ebdf7c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,4 @@ reftest_compare_surfaces-Report-how-much-the-images-diffe.patch reftests-Allow-minor-differences-to-be-tolerated.patch -build-Get-typelib-dir-dynamically-using-gobject-introspec.patch -textbtree-Initialize-to-zero-the-tags-counting-array.patch debian/Disable-web-fonts-for-now.patch debian/templates-Remove-html5shiv.patch diff --git a/debian/patches/textbtree-Initialize-to-zero-the-tags-counting-array.patch b/debian/patches/textbtree-Initialize-to-zero-the-tags-counting-array.patch deleted file mode 100644 index c89b7e4f24..0000000000 --- a/debian/patches/textbtree-Initialize-to-zero-the-tags-counting-array.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Fri, 9 Jul 2021 03:34:40 +0200 -Subject: textbtree: Initialize to zero the tags counting array - -We're using the tag contents array to count the number of invisible tags -set but we always increase it without being initialized. - -This may lead to unexpected behavior when traversing them and it's -causing a reliable failure in the textiter tests under s390x. - -So, memset that area content to 0 once allocated. It's not needed to do -the same for the tags themselves as we always assign them. - - Conditional jump or move depends on uninitialised value(s) - at 0x4CFAA00: _gtk_text_btree_char_is_invisible (gtktextbtree.c:2569) - by 0x4B8A1BB: find_visible_by_log_attrs (gtktextiter.c:3244) - by 0x10E93D: check_backward_visible_word_start (textiter.c:484) - by 0x10E93D: test_visible_word_boundaries (textiter.c:523) - by 0x533288F: g_test_run_suite (in /usr/lib/s390x-linux-gnu/libglib-2.0.so.0) - by 0x53328E7: g_test_run (in /usr/lib/s390x-linux-gnu/libglib-2.0.so.0) - by 0x109CC1: main (textiter.c:807) - -Origin: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3740 ---- - gtk/gtktextbtree.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c -index 0acc023..91ab335 100644 ---- a/gtk/gtktextbtree.c -+++ b/gtk/gtktextbtree.c -@@ -2483,6 +2483,8 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter) - tagCnts = g_alloca (sizeof (int) * numTags); - tags = g_alloca (sizeof (GtkTextTag *) * numTags); - -+ memset (tagCnts, 0, sizeof (int) * numTags); -+ - /* - * Record tag toggles within the line of indexPtr but preceding - * indexPtr. -- 2.30.2